Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SPARK-1189: Add Security to Spark - Akka, Http, ConnectionManager, UI use servlets #33

Closed
wants to merge 16 commits into from
Closed

SPARK-1189: Add Security to Spark - Akka, Http, ConnectionManager, UI use servlets #33

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f351763
Add Security to Spark - Akka, Http, ConnectionManager, UI to use serv…
tgravescs Jan 19, 2014
5721c5a
update AkkaUtilsSuite test for the actorSelection changes, fix typos …
tgravescs Jan 20, 2014
2d9e23e
Merge remote-tracking branch 'upstream/master' into security-branch-0…
tgravescs Feb 18, 2014
6f7ddf3
Convert SaslClient and SaslServer to scala, change spark.authenticate…
tgravescs Feb 22, 2014
ed3d1c1
Add security.md
tgravescs Feb 22, 2014
b514bec
Fix reference to config
tgravescs Feb 22, 2014
ecbfb65
Fix spacing and formatting
tgravescs Feb 22, 2014
50dd9f2
fix header in SecurityManager
tgravescs Feb 22, 2014
2f77147
Rework from comments
tgravescs Mar 3, 2014
4a57acc
Change UI createHandler routines to createServlet since they now retu…
tgravescs Mar 3, 2014
13733e1
Pass securityManager and SparkConf around where we can. Switch to use…
tgravescs Mar 6, 2014
ac046b3
Merge remote-tracking branch 'upstream/master' into security-branch-0…
tgravescs Mar 6, 2014
05ff5e0
Fix up imports after upmerging to master
tgravescs Mar 6, 2014
d1040ec
Fix up various imports
tgravescs Mar 6, 2014
05eebed
Fix dependency lost in upmerge
tgravescs Mar 6, 2014
dfe3918
Fix merge conflict since startUserClass now using runAsUser
tgravescs Mar 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix up imports after upmerging to master
  • Loading branch information
@tgravescs
tgravescs committed Mar 6, 2014
commit 05ff5e092bd144f1d046de5bc8298d46ca5e69d4
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import scala.annotation.tailrec
import scala.util.{Failure, Success, Try}
import scala.xml.Node

import net.liftweb.json.{JValue, pretty, render}
import org.json4s.JValue
import org.json4s.jackson.JsonMethods.{pretty, render}

import org.eclipse.jetty.server.{DispatcherType, Server}
import org.eclipse.jetty.server.handler.HandlerList
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/scala/org/apache/spark/util/AkkaUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ import akka.actor.{ActorSystem, ExtendedActorSystem, IndestructibleActorSystem}
import com.typesafe.config.ConfigFactory
import org.apache.log4j.{Level, Logger}

import org.apache.spark.SparkConf
import org.apache.spark.{Logging, SecurityManager}
import org.apache.spark.{Logging, SecurityManager, SparkConf}

/**
* Various utility classes for working with Akka.
Expand Down
2 changes: 1 addition & 1 deletion repl/src/main/scala/org/apache/spark/repl/SparkIMain.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import scala.tools.reflect.StdRuntimeTags._
import scala.util.control.ControlThrowable
import util.stackTraceString

import org.apache.spark.{HttpServer, SparkConf, Logging, SecurityManager}
import org.apache.spark.{Logging, HttpServer, SecurityManager, SparkConf}
import org.apache.spark.util.Utils

// /** directory to save .class files to */
Expand Down
2 changes: 1 addition & 1 deletion yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.apache.hadoop.yarn.util.{ConverterUtils, Records}
import akka.actor._
import akka.remote._
import akka.actor.Terminated
import org.apache.spark.{SparkConf, SparkContext, Logging, SecurityManager}
import org.apache.spark.{Logging, SecurityManager, SparkConf, SparkContext}
import org.apache.spark.util.{Utils, AkkaUtils}
import org.apache.spark.scheduler.cluster.CoarseGrainedSchedulerBackend
import org.apache.spark.scheduler.SplitInfo
Expand Down
2 changes: 1 addition & 1 deletion yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import org.apache.hadoop.yarn.ipc.YarnRPC
import org.apache.hadoop.yarn.util.{ConverterUtils, Records}
import org.apache.hadoop.yarn.webapp.util.WebAppUtils;

import org.apache.spark.{Loggin, SecurityManager, SparkConf, SparkContext}
import org.apache.spark.{Logging, SecurityManager, SparkConf, SparkContext}
import org.apache.spark.deploy.SparkHadoopUtil
import org.apache.spark.util.Utils

Expand Down
2 changes: 1 addition & 1 deletion yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import org.apache.hadoop.yarn.util.{ConverterUtils, Records}
import akka.actor._
import akka.remote._
import akka.actor.Terminated
import org.apache.spark.{SparkConf, SparkContext, Logging, SecurityManager}
import org.apache.spark.{Logging, SecurityManager, SparkConf, SparkContext}
import org.apache.spark.util.{Utils, AkkaUtils}
import org.apache.spark.scheduler.cluster.CoarseGrainedSchedulerBackend
import org.apache.spark.scheduler.SplitInfo
Expand Down